Add check for conflict markers