final changes...
solved merge conflicts