solving merge conflicts(caused by @hooman)