Fixed merge issue at bottom of code