The merge tool didn't realize that new files from one branch should have a format adhering to that of another branch.