Resolving conflicts
Working on ASP.NET changes