Add conflict resolver
Hot exit and new snippet