styling
fixing merge conflicts