i hope merge has all the bugs worked out now so we can play with out worry