Hi As Boundewijn also suggested the best way to do the merger would be to update the autolayers branch and then the other way back. As I see it there is only one real showstopper for doing the merger: The undo system is currently broken, but when that is fixed I think that the rest is best solved within HEAD where it gets more attention. best regards Casper