Fix for merge conflict