Construction conflict solutions