comment some dbg info, clean up some codes
resolving conflicts
nothing