fix conflicts during merge