resolve reflict