fixed dirty dirty twoway git merge hack