resolve conflicts in workshop controller