Merging the right files w/o conflicts