fix for merge conflict