fixing stuff
Fixing merges