Fixing conflicts in problem controller