resolved conflicts
update git ignore file