Accidentally checked in partially merged  code