Improving getting started page
resolving conflicts