I'm trying to merge branches