test suite added
merging errors