GCC: fix conflicts.