style changes to delete
merge conflict