conflict fucking solved