Integration merge phase 2