removed confilict in change