add fedora notes
fix conflicts