Testing merge conflicts
Fixed problems