I need to resolve this merge conflict.