Added merging of staged changes in getAttributes()
Completed getAttributes() docblock