Fix file which wasn't moved properly during merge