small changes
solved merge conflict