make merge more happy.