Merging files from my branch