Updated the Makefile clean.
Added some values to clean and fixed a merge conflict.