Update MergeConflicter.php