conflict solved

o_o