Merge un-commit changes from local master