manually merging previous changes