merge conflicts addressed?