Make it run after merge with master