initial setup
fixed merge conflicts