fixing non-fastforward merge