remove file before a new merge / option to merge in the following iteraction