add conflict clause for smooth upgrade