symbol map progress
fix merge conflicts