character running loop
merging conflict