removed unsolved conflict [skip ci]