Comparing image
fixing conflicts