Removed a missed merge conflict.