removed extra src directory that was in the merge