attempting to clean repo of files that shouldnt be tracked
conflict