fixing merge conflict in main_allelotype