Fixing failed tests
Commit after resolving conflicts
Fixing failed tests