added horse
resolve conflicts
resolved conflicts again