aplicando psr
refactoring the code
resolving conflicts