Fix merge erros on page with frames