Resolve

@khaled-barca