merging ... removing master