Bebertz second commit
Fixed merge conflict