Remove 'SET search_path' statements and use absolute naming
Fix merge issues