fixed formatting and merge conflicts