clean the merge mess