starting project
fixed merge