Fix merge confict and csproj release output