resolve merge conflict due to new repo overwriting old