needs resolution or deletion before merging