Add license file
fix merge conflict