Fix clobbered changes
Fix merge