targa: resolve conflicts