added merge
corrected copy/paste error
formatting
formatting