hahaha fae conflict
changes in readme