Fix merge conflict thanks @marcel12bell, close #1