fixed confilcst
Swithcing