Trying to merge 2 branches