Map Changes, Merge Conflict Fix? I hope?