fixed up l ittle bug from merge conflict