init commit
fixed ignore conflicts