Add some comments for conflict