update merge style