Integration merge phase 1