Fix lots of bugs
Fix conflict