begin styling
begin styling
merge conflicts resolved