commit 8
resolved merge conflict
copleted codding