Style changes
merge conflict solved