style changes
fixing merge conflict