Fix for merge spam