Merging the new files locally
Merging locally