Cleaning for merge