Merge our work