fixed report -> thesis
fixed conflict