I bem  no conflicts master

issue #290