Attempting to merge across branches