completed merge with master