merging branch_one to main after editing branch1file in both to see what changes from a normal merge.