Accidentally committed incomplete merge