image like partially
resolved conflict