changes from Sunday can't remember what
resolve conflict
localization