check for conflict with remote master