getting map working
get map working
resolve merge conflict