Fix headings
resolve merge conflict in readme