Resolve merge conflicts after big changes