dave pushing changes
merge conflict resolved