cleaning after merge