whahaha fixed a merge conflict in the license