fixed conflicts errors #157 #160