listing contacts fixed after merge conflict