fix merge conflict II - integracao frontend e backend