-- update conflicts in received module