adding merge conflicts