abstract conflicts fixed

Should work for everyone as long as they followed the instructions I
provided in the email