Added more styling
Resolving Conflicts
going for lunch