From 0cbb800eac54abbed6b40c3bc9c75c21d69f304c Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sun, 12 May 2019 13:44:53 +0200
Subject: [PATCH] fix merge issues

---
 src/ImageSharp/Color/Color.Conversions.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ImageSharp/Color/Color.Conversions.cs b/src/ImageSharp/Color/Color.Conversions.cs
index 3123d89e96..16d673d85d 100644
--- a/src/ImageSharp/Color/Color.Conversions.cs
+++ b/src/ImageSharp/Color/Color.Conversions.cs
@@ -62,12 +62,19 @@ namespace SixLabors.ImageSharp
         [MethodImpl(InliningOptions.ShortMethod)]
         public Color(Vector4 vector) => this.data = new Rgba64(vector);
 
-        [MethodImpl(InliningOptions.ShortMethod)]
+        /// <summary>
+        /// Converts a <see cref="Color"/> to <see cref="Vector4"/>.
+        /// </summary>
+        /// <param name="color">The <see cref="Color"/>.</param>
+        /// <returns>The <see cref="Vector4"/>.</returns>
+        public static explicit operator Vector4(Color color) => color.data.ToVector4();
+
         /// <summary>
         /// Converts an <see cref="Vector4"/> to <see cref="Color"/>.
         /// </summary>
         /// <param name="source">The <see cref="Vector4"/>.</param>
         /// <returns>The <see cref="Color"/>.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
         public static explicit operator Color(Vector4 source) => new Color(source);
 
         [MethodImpl(InliningOptions.ShortMethod)]
@@ -84,12 +91,5 @@ namespace SixLabors.ImageSharp
 
         [MethodImpl(InliningOptions.ShortMethod)]
         internal Bgr24 ToBgr24() => this.data.ToBgr24();
-
-        /// <summary>
-        /// Converts a <see cref="Color"/> to <see cref="Vector4"/>.
-        /// </summary>
-        /// <param name="color">The <see cref="Color"/>.</param>
-        /// <returns>The <see cref="Vector4"/>.</returns>
-        public static explicit operator Vector4(Color color) => color.data.ToVector4();
     }
 }
\ No newline at end of file