first commit
fixed conflict
Remove ignored files