Add LICENCE and update README.
Fix merge conflict.