updating more
fix conflicts