Fixed readme merge issues