Rival lawmakers resolve to end rifts with Somali govt