merge prep
merge prep
collision handling simplified