added style
resolving conflicts