BAttempting to merge branches