cosmetics
clear old merge