map support
fix conflicts