fix master
merge res
final b other