Fixing merge problems