Updated for Fedora 21
Fix conflicts