Edit file in dev
Edit in master
Fix file content
Fix merge conflicts