fix git mess
more fixes after git merge mess