adding more setup instructions
resolving conflicts