Merge ""#warning" conflict with -Werror"