conflit_remote