fix bug
fix conflicts