Resoved conflicts