non-conflict patch