truemotion1: resolve conflicts