Fixed some stuff
Fix merge fail