add tests
resolved conflict