Migration conflict on master branch