Clean garbage after merge
Fix bug #32