Removed conflict data from source