Latest

fixed conflict problems