Cleaned up some code
Fixed conflicts
Fix conflicts