When conflicts arise between files, this is where my project is stored