ticket:4
merge conflicts fixed