Conflicts: include/micrel.h The conflict above was trivial, caused by four lines being added in both branches with different whitepace.