tidy
fixed merge conflicts