init project
resolved readme conflicts