"ours" merge to ignore the changes to src/common/compat.c, they have already been merged to 0.3.5 in the correct file.
teor