current
style updates
conflicts resolved
conflict resolved