adding local changes and merging with the remote changes
merging with remote