test for push/pull conflicts