fix conflicts and comments
fix conflicts