header fixes
conflicts resolved