resolving merge conflicts

Signed-off-by: greenTara <taraathan@gmail.com>