adding update items ability
Fixed Bugs
merging files