conflict solved lol