fixed the update issue and the overflow issue
fixing merge conflict