fixed untracked files
merging shit