Fix merge issues
Minor edit