initial start to project
fixed merge