Didn't do merge conflicts correctly