Merge development and testing