fixed conflicts errors #157 #160

@mariam-ismail