2L Local changes
3L Merged with remote