merge richs branch