modify some img
modify json parser
resolve conflict