Add some licence
Fix conflicts