character stuff
resolve conflics