Added licence
Fix merge conflicts