update rubtris
completing merge