fixed test, merging works