Forgot a little thing on the conflict, solved now