Fix up some code
Fix conflict