ulti: resolve conflicts