Add LA 6
Resolve conflict