fixed merge stuff and formatting