Fixed merge balls above the line#2

alejandronespereira wants to merge 1 commit intojanza:masterjanza/combine:masterfrom

alejandronespereira:bug/fix_merge_edgecasealejandronespereira/combine:bug/fix_merge_edgecaseCopy head branch name to clipboard