second commit finishing the merge from master