finish circles map
fix conficts