Trying to fix stuff
Fix merge errors