fixing errors introduced during merge