fixed the failing tests
solved merge conflicts