fixed what was lost on merge