Added project
Fixed merge conflict