Fix/merge conflicts