checking mersging conflicts on slave