updates
merge
fixed untracked files