Fixing unnecessary merge conflict