whoops, messed up a conflict with gitignore