unit tests
resolved conflict