Fix typo that was breaking merge functionality