First commit
Fixed Conflicts with license