cleaning for merge