got frogro working
fixed conflicts