Lock file was changed by last merge.