Update converte impute2 data to trityper + fix merge conflicts