Fix merging mistakes