update work to merged master