Added patch conflict detecting functions