Fixed botched merges