simple commit
fixed merge conflict
added behaviour