more comments
Fixed conflict