Merge custom changes