add test
fix conflicts