generate comment controller for client
fix conflicts