finishing merge ignore .bak files