GitHub's backward blocking causes conflict aggravation

https://map.bnnd.eu.org/user/jidanni/diary/393710