Removed conflict sections

Happens to me way too often that these stay in....