fixed funky weirdness the git merge had that destroyed the build path and project