fix merge conflict - integracao frontend e backend