Made merge conflicts