cover merge almost there