BRS internal conflict

You may have missed