Cleaned up some debugging messages
Fixed conflicts