humans rule
resolve merge conflict