line 244

OLD

<<<<<<< HEAD
    <Compile Include="Migrations\201301191833364_RemovedExtraPasswordField.cs" />
    <Compile Include="Migrations\201301191833364_RemovedExtraPasswordField.Designer.cs">
      <DependentUpon>201301191833364_RemovedExtraPasswordField.cs</DependentUpon>
    </Compile>
=======
>>>>>>> master


NEW: note the lack of >>>> or <<<<< or =====

    <Compile Include="Migrations\201301191833364_RemovedExtraPasswordField.cs" />
    <Compile Include="Migrations\201301191833364_RemovedExtraPasswordField.Designer.cs">
      <DependentUpon>201301191833364_RemovedExtraPasswordField.cs</DependentUpon>
    </Compile>