Add ifndef conflict resolving construction to hrl