make cleaner
fixing merge conflicts