second attemt at push
tried mergetool