Still needs to sync before merging files