Apps with '3 way merge' feature