merge flixrs changes, ahrs working