merging development