c++-mode for .h files.
resolve conflict