Merge commit was wrongly included by lazo

[Heliosmaster]

History of events:

1. Main and module repo are in sync
2. Two branches start, A and B. A has some commits that affect the module. B has nothing to do with it.
3. Branch A is merged in master, Lazo successfully syncs the module.
4. Branch B merges master in. Lazo pushed the reverse commit than in step 3.
5. Branch B is merged in master, Lazo does nothing.
6. Branch C starts from master and is merged back. Lazo detects a change and adds the changes of step 3 again.