diff --git a/rtdata/profiles/neutral.pp3 b/rtdata/profiles/neutral.pp3
index dec3ff071..dd293e867 100644
--- a/rtdata/profiles/neutral.pp3
+++ b/rtdata/profiles/neutral.pp3
@@ -1,3 +1,17 @@
+<<<<<<< local
+<<<<<<< local
+[Version]
+Version=20101019
+
+[Exposure]
+Auto=false
+Clip=0.001
+Compensation=0
+Brightness=0
+Contrast=0
+=======
+=======
+>>>>>>> other
 [Version] 
 Version=20101019 
  
@@ -7,7 +21,37 @@ Clip=0.001
 Compensation=0 
 Brightness=0 
 Contrast=0 
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
 Saturation=0
+<<<<<<< local
+<<<<<<< local
+Black=0
+HighlightCompr=0
+ShadowCompr=0
+Curve=0;
+
+[Channel Mixer]
+Red=100;0;0;
+Green=0;100;0;
+Blue=0;0;100;
+
+[Luminance Curve]
+Brightness=0
+Contrast=0
+Saturation=0
+LCurve=0;
+aCurve=0;
+bCurve=0;
+
+[Sharpening]
+Enabled=false
+Method=usm
+=======
+=======
+>>>>>>> other
 Black=0 
 HighlightCompr=0 
 ShadowCompr=0 
@@ -29,11 +73,36 @@ bCurve=0;
 [Sharpening] 
 Enabled=false 
 Method=usm 
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
 Radius=0.8
 Amount=120 
 Threshold=512 
 OnlyEdges=false 
 EdgedetectionRadius=1.9
+<<<<<<< local
+<<<<<<< local
+EdgeTolerance=1800
+HalocontrolEnabled=false
+HalocontrolAmount=85
+DeconvRadius=0.75
+DeconvAmount=75
+DeconvDamping=20
+DeconvIterations=30
+
+[Color Boost]
+Amount=0
+AvoidColorClipping=false
+SaturationLimiter=false
+SaturationLimit=75
+
+[White Balance]
+Setting=Camera
+=======
+=======
+>>>>>>> other
 EdgeTolerance=1800 
 HalocontrolEnabled=false 
 HalocontrolAmount=85 
@@ -50,8 +119,128 @@ SaturationLimit=75
  
 [White Balance] 
 Setting=Camera 
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
 Temperature=5200
 Green=1.0
+<<<<<<< local
+<<<<<<< local
+
+[Color Shift]
+ChannelA=0
+ChannelB=0
+
+[Impulse Denoising]
+Enabled=false
+Threshold=50
+
+[Directional Pyramid Denoising]
+Enabled=false
+Luma=10
+Chroma=10
+Gamma=2
+
+[Luminance Denoising]
+Enabled=false
+Radius=2.5
+EdgeTolerance=1500
+
+[Chrominance Denoising]
+Enabled=false
+Amount=20
+
+[Shadows & Highlights]
+Enabled=false
+HighQuality=false
+Highlights=0
+HighlightTonalWidth=80
+Shadows=0
+ShadowTonalWidth=80
+LocalContrast=0
+Radius=30
+
+[Crop]
+Enabled=false
+X=0
+Y=0
+W=4276
+H=2836
+FixedRatio=false
+Ratio=3:2
+Orientation=Landscape
+Guide=None
+
+[Coarse Transformation]
+Rotate=0
+HorizontalFlip=false
+VerticalFlip=false
+
+[Common Properties for Transformations]
+AutoFill=true
+
+[Rotation]
+Degree=0
+
+[Distortion]
+Amount=0
+UseLensFun=false
+
+[Perspective]
+Horizontal=0
+Vertical=0
+
+[CACorrection]
+Red=0
+Blue=0
+
+[Vignetting Correction]
+Amount=0
+Radius=50
+Strength=1
+CenterX=0
+CenterY=0
+
+[HLRecovery]
+Enabled=false
+Method=CIELab blending
+
+[Resize]
+Enabled=false
+Scale=1
+Method=Bicubic
+DataSpecified=0
+Width=4276
+Height=2836
+
+[Color Management]
+InputProfile=(camera)
+ApplyGammaBeforeInputProfile=false
+WorkingProfile=sRGB
+OutputProfile=No ICM: sRGB output
+
+[Equalizer]
+Enabled=false
+C0=0
+C1=0
+C2=0
+C3=0
+C4=0
+C5=0
+C6=0
+C7=0
+
+[Directional Pyramid Equalizer]
+Enabled=false
+Mult0=1
+Mult1=1
+Mult2=1
+Mult3=1
+Mult4=0
+=======
+=======
+>>>>>>> other
  
 [Color Shift] 
 ChannelA=0 
@@ -163,8 +352,27 @@ Mult1=1
 Mult2=1 
 Mult3=1 
 Mult4=0 
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
  
 [RAW] 
+<<<<<<< local
+<<<<<<< local
+DarkFrame=
+DarkFrameAuto=false
+CA=false
+HotDeadPixels=false
+LineDenoise=0
+GreenEqThreshold=0
+CcSteps=1
+Method=amaze
+DCBIterations=2
+DCBEnhance=false
+=======
+=======
+>>>>>>> other
 DarkFrame= 
 DarkFrameAuto=false 
 CA=false 
@@ -175,3 +383,7 @@ CcSteps=1
 Method=amaze 
 DCBIterations=2 
 DCBEnhance=false 
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other