fix auto-conflict and auto-depopts of lwt
Merge pull request #2004 from samoht/master

fix auto-conflict and auto-depopts of lwt