add .ignore
merge with remote changes