Removed remains of a merge conflict.
By Geoff