cleaning
fix conflicts