Resolved GameController merge