Trying to merge branch with origin