Preserve soft and hard conflict data when testing merge
Preserve soft and hard conflict data when testing merge

dimitar-asenov/Envision,lukedirtwalker/Envision,dimitar-asenov/Envision,dimitar-asenov/Envision,lukedirtwalker/Envision,dimitar-asenov/Envision,lukedirtwalker/Envision,dimitar-asenov/Envision,lukedirtwalker/Envision,dimitar-asenov/Envision,lukedirtwalker/Envision,lukedirtwalker/Envision