dorky image is less dorky
dorky image merge conflict