- image path re-reference
- add model detail
- stash conflict merged