Last merge error removed