fixing the copy/paste thing and commenting out a magit fix that I'm not
sure about
fixing conflict