Fix merge and fix startup crash