indeo3: resolve confilcts
kmvc: resolve conflicts
kmvc: resolve conflicts