Trunk modified without possibility to merge cleanly