merging work in progress