Wipe makefile, for removing conflicts and reverting to previous