trying to figure out how to merge branches