Editing line local
Fixed upstream and local conflict
Local conflict
Merged with upstream