Add back the style that got removed while resolving conflicts