merged branch map, fixed version conflict