resolved conflict

@AdelZee 
please review and merge