Merges branches for deploy