More fixes for merging - it's working now
Oops, forgot te remove debug print...