fixed weird stuff that happened during the merge