lowercase all references
resolve merge conflict