changes after the merge