fix location on merge bug