change linendings that where mixed with last merge