Fixes merge conflicts (hopefully).

Try that @garemoko :+1: hopefully that works, I can't believe how picky Git is being about this request.