The merge conflict additions are still in this