Removed spurious merge