init user
merged gitignore file conflicts