Resolve conflicts
Merge branch 'master' of git@github.com:ULE-Bank/ULEBank.git