init commit
fixed initial merge conflicts