removed project files, because having conflicts sucks!