merging iassic develop