merging ucommited changes to git