Adam/merge conflicts