Yes, I agree, but I simply applied all the changes from #55 and resolved the conflicts.
Do you want me to remove it?