deleted xib
fixed conflict