fix contacts crash
merge