warzone2100 update, merge resulution patch