fixes merge error