adding examples 4
resolve conflict