changes before merging branch