completed 007
fixed merge conflict