Fix conflict, hold process still bug