fix accidental inclusion of merge line