maybe there is conflicts with the on-going changes in code/settings. You can make a copy of your work, and checkout the project anew.