Trying to merge branches is hard...