refactor tickets controller
fix merge conflict