Parse conflicts