map offs
fix merge conflict
updates