added more complex merge tests