Man do I hate this behavior because it would be really some by just using the branch names rather then "ours" and "theirs"