Fixed merge goofups