Remove conflicted package.
Little corrections for makefile.