minor fix for merge