final changes after merging