minor style improvements for Packrat action and conflict dialog
fix merge conflict