Styling changes
resolve merge conflict