changed help message about where to submit bugs
resolved conflict in ui file