Finish with finding new spot.
Still trying to resolve conflict with finish new spot