models yay
merge resource conflicts