changes made to functions
edits to function
added privileges
merge conflict