Fix some compile errors
Fix merge conflict