Style changes
Added requirements and resolved conflict