Merge conflicts with new repo