Add code of conduct
Resolve merge conflicts