conflicts on README from #48 and #50