changed to eclipse generated project
resolved merge conflict