All tests done
Merging