Conflicted buglist fixed

This should fix up the bug_conflict