finalized formatting for help
resolved conflict