Poland and Ukraine calm dispute over Volhynia massacre for commemoration