Basic Update

Basic Update is to resolve any conflicts that may occur