merging devel