red_14_16_acu177672_chimp_2point0 - fixing merge conflicts