DBmanager test finished
Fixed conflicts