moar testing
local-config change
resolve conflict