clean conflicts forked modules