Merging development