beginning formatting
fixed merge conflict