added ticketComment and TicketNode model
fixed conflicts