style changes
merge conflicts fixed