contacts word removed
reslved merged conflicts