fix requirements
merge t1