finished issue #3
fixed merge conflict