remove a slash i accidentally deleted in the conflict merge