Resolved a merge conflict.