added tests
resolved conflicts