cleaned up mistakes made by the merge