Manually merging changes