tests minor change for pull sync
fixing conflict issue