commit before pull
conflicts
author internationalization