conflicts bug-buddy2
