git commit list and render image form external
resolve conflict
resolve commit