why is all this showing up here? Are you rebased to current master?