Applying the code convention in package Exceptions and Models
Solving conflicts
Solving conflicts
Solving conflicts