the dreaded @mscoll85 merge conflict resolution :)