fixed indiginauts merge