development merging