Issue #201 resolve conflict

reviewers: 
@fadel1493 @Sharaf93 @rami-khalil @mimikian @mohamedsaeed93