Fixing extra merge mark