Bad Merge: Readd maven distribution management