add nib
fixed conflict