Fix merge conflicts

Signed-off-by: MHesham <mhesham.fcis@gmail.com>