diff --git a/.gitignore b/.gitignore
index d553134..90dbacb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,16 +16,9 @@ Cargo.lock
 .vscode/
 .idea/
 
-<<<<<<< HEAD
 *.dot
 *.mmd
 
 .direnv
 
 **/render-docs
-||||||| e498f11
-*.dot
-=======
-*.dot
-.direnv
->>>>>>> record-example-tests
diff --git a/flake.nix b/flake.nix
index 4493eea..865a3cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
@@ -21,6 +20,12 @@
         };
       in {
         devShells.default = pkgs.mkShell rec {
+          rustToolchain = pkgs.rust-bin.stable.latest.default.override {
+            targets = [ "wasm32-unknown-unknown" ];
+            extensions = [ "rust-src" "rust-analyzer" ];
+          };
+          RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library";
+
           buildInputs = with pkgs; [
             # necessary for building wgpu in 3rd party packages (in most cases)
             libxkbcommon
@@ -88,39 +93,4 @@
           '';
         };
       });
-}
-||||||| e498f11
-=======
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
-    };
-  };
-
-  outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [ (import rust-overlay) ];
-        };
-      in {
-        devShells.default = pkgs.mkShell rec {
-          rustToolchain = pkgs.rust-bin.stable.latest.default.override {
-            targets = [ "wasm32-unknown-unknown" ];
-            extensions = [ "rust-src" "rust-analyzer" ];
-          };
-          RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library";
-
-          buildInputs = with pkgs; [ trunk rustToolchain cargo-watch ];
-        };
-      });
-}
->>>>>>> record-example-tests
+}
\ No newline at end of file