Manually merging a change from master