Fix merge, remove duplicate case in switch

Change-Id: I50f0492f7eb0714132b8e85f2995919d66eb20a7