basic styling
fixing merge conflicts
fixing merge conflicts