fix merge conflicts

include/gpu_regs.h

@@ -1,6 +1,11 @@
 #ifndef GUARD_GPU_REGS_H
 #define GUARD_GPU_REGS_H
 
+// Exported type declarations
+
+// Exported RAM declarations
+
+// Exported ROM declarations
 void InitGpuRegManager(void);
 void CopyBufferedValuesToGpuRegs(void);
 void SetGpuReg(u8 regOffset, u16 value);
@@ -11,4 +16,4 @@ void ClearGpuRegBits(u8 regOffset, u16 mask);
 void EnableInterrupts(u16 mask);
 void DisableInterrupts(u16 mask);
 
-#endif // GUARD_GPU_REGS_H
+#endif //GUARD_GPU_REGS_H