adding code of conduct
merge