Add clean argument
Fix merge conflict