Getting started
fixed merge issues.