Fix wrong imports resulting from bad merging