The pages look good. However, the conflicts may be too difficult to resolve. We should create a new branch from main before making these changes to the individual files. The problem is that the commit history goes back too far for this branch and there has been too many changes to main since you originally created it.
The pages look good. However, the conflicts may be too difficult to resolve. We should create a new branch from main before making these changes to the individual files. The problem is that the commit history goes back too far for this branch and there has been too many changes to main since you originally created it.