fixing weird stuff from the merge
2 files changed