fixing more conflicts