Fix merge detection
Merge branch 'fix-merge-detection'