Removed remaining conflict markup