Don't squash anymore, just do a normal merge