removed xib
merged