Fix stray merge content
Short term comment out unittest @gitumarkk please review