Testing merging of files into a branchs