Manually merge changes