proj1a merge new6