Fix/ants

resolved a conflict