Secure class
Solved conflicts