fix control transformation
resolve conflicts