Help to solve conflict

[Agaba_Derrick_Junior]

Hey @Sayed_Abdo do you wanna share the picture of the code that is conflicting?
Alternatively we can solve it in the dev call today