init
fixed conflict of .gitingore