new approach in three way merge