Adding chmod changes to getting started
Conflict fix