Removed backup files from merging