Conflicts working now, I swear. Still a small issue occasionally when you delete a course, working on it.