cleanup merge with master