game af
conflicts fixed