Fixing merge problems more