Trunk modified without possibility to merge cleanly
Trunk modified without possibility to merge cleanly