Fix some things
Fix conflict