setter/getter for private variable
merge conflict