design conflicts remodeling