Git conflict remove
Git conflict remove
Git conflict remove
Refactoring of sys/error files