Syncing files for merge