Manually cleaned up bad merge