fixed gem conflicts
cleaned up header tags