Fix conflict
Readd production keys