Some random shit
Conflict solved and doing some random shit