Clean before merge

It may conflict without clean.