last commit for the day -eris
resolving conflits -eris
Merge branch 'master' of https://github.com/devkinetics/trn-mergeconflicts
conflicts -eris
conflict conflict -eris