Changing file in dev-branch
Changing file in master-branch
Fixing merge conflicts