Editing in dev_branch
Editing in master
Fix merge conflicts