pictordec: resolve conflicts