commit 1.3
merge conflicts