Don't copy/paste to resolve merge conflicts >.>