contacts done
resolve merge conflicts
fixed merge conflict