Remove some comments
fix second conflict