merge gjj1001 and debug