fix map conflict