Conflicted buglist fixed