fix internal manipulator error
fix finishTurnlog
fix main scene test
fix conflicts