new commit 1.5
merge conflicts resolved