Solved some merge conflicts.

Didn't cause an issue, but pronterface threw warnings.