changes made in tickest show and todo's controller
removed conflicts