conflict solved, yeah \o/
multi-confict