local minor issue changes
merge conflict resolved