some styling, typo fix
resolved conflict