Added game controller skel
fixed migration
fix confl