Copy edit. Remove merge conflict.