fix the conflicts in contact