merge alloc
back up for merge
conflixt