Add case for a three-way conflict