Development merged