Few changes in updates
Resolved Conflicts