Basic Update

Resolving conflicts