fix merge conflicts

Author: zenith391

examples/colors.zig

@@ -15,7 +15,7 @@ pub fn animateRandomColor(button_: *anyopaque) !void {
     rect.color.animate(capy.Easings.InOut, randomColor, 1000);
 }
 
-pub fn start() !void {
+pub fn main() !void {
     try capy.init();
     var window = try capy.Window.init();
     prng = std.rand.DefaultPrng.init(@as(u64, @bitCast(std.time.milliTimestamp())));
@@ -28,5 +28,5 @@ pub fn start() !void {
         }),
     }));
     window.show();
-    // capy.runEventLoop();
+    capy.runEventLoop();
 }

src/backends/wasm/backend.zig

@@ -488,16 +488,6 @@ pub const Container = struct {
         _ = self;
     }
 
-    pub fn remove(self: *const Container, peer: PeerType) void {
-        _ = peer;
-        _ = self;
-    }
-
-    pub fn setTabOrder(self: *const Container, peers: []const PeerType) void {
-        _ = peers;
-        _ = self;
-    }
-
     pub fn move(self: *const Container, peer: PeerType, x: u32, y: u32) void {
         _ = self;
         js.setPos(peer.element, x, y);