Update style changes
Fixed conflicts