merge conflict

styling changes

merge conflict

lint fix