Merging changes from older project