Some refactoring. Moved conflict reslover logic onto game manager.