Fixing merge problems from bij - Zad merge