Israeli government ends feud that sparked snap election talk