More wording changes on version conflicts