mergeado as mudancas