removed backup files generated during merge