You aren't merging correctly. This is all in master and shouldn't be in your diffs.