issue3A
issue3B
issue3C
fix conflict2