resolve conflict

@YoussefSaleh