A new model combining building block displacement and building block area reduction for resolving spatial conflicts · Study