merged with my work