#2010 - Changed conflicts to reference locations instead of location configurations