merging package files from master
removing the merge statments