Change some stuff
Fix merge conflict