Reverted the conflict made by Mario