address merge conflicts