Edit in dev branch
Fix merge conflicts