Merging debian work