Don't need test2 anymore
merge