Changed image size
resolving conflicts
conflict resolution attempt