Fixing conflicts before merge