update master with untracked and not staged files