finished edit Ganswer
finished edit Ganswer
fix merge bug
that bug with js fixed :)