still fixing merge

sorry guys