gcc: fix conflicted files