Deleted temp file
Trying to fix an Eclipse problem
After merge