Helped clean up the merge