I hope you can merge it now

Can't this be done automatically (I've just done it manually)