adding undoing uncommitted changes
merged changes from remote master