conflicts bug-buddy2