Fix bad merge, add license and me to author