resolved conflict

Signed-off-by: Bhushan Balki <b.balki@globallogic.com>