merge fix
Fix merge erros