Database Conflict Fix