* correction conflit