added to git ignore
merged