initial creation
merged conflict in . ignore