I moved the files in the repository Yesterday. but it changes are not committed.
And it has conflicts.

Then, I “resolve” to the conflict folder Immediately.
As a result, yesterday I could not do anything in the server error.

Yesterday and today I get an server error but different.

I have account “lightwings” that is permission of owner, but I have no access rights, since this morning.

fix my account please.