Manual merge because git is dumb.