GameBrain is functional
fix conflicsts