Updated merge conflicts