diff --git a/manifest b/manifest
index d9f2b41..1d5cb41 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Added\sHTPP\sProxy\sglobal\ssetting\n
-D 2014-08-06T10:43:45.077
+C Fixed\sissue\swhere\sconflicted\sfiles\scould\snot\sbe\sreverted
+D 2014-08-26T12:30:14.717
 F dist/arch/PKGBUILD 1d72dad77767f94a6b1a018067188e61927fa564
 F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e
 F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381
@@ -187,7 +187,7 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp f321f9e0b9aa3f55966f3c19fb3d3c3488676fe1
+F src/MainWindow.cpp d20f68bbf1c2a42b27f8c46872d449688696e205
 F src/MainWindow.h dc0a9ed7de8a338e56c38c00ec303796f31bd24d
 F src/SettingsDialog.cpp d428569ce54c38bc979cf06d9a04f6e7f4a76a6d
 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
@@ -201,7 +201,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
 F ui/MainWindow.ui 7ede8bbb54513e0771fdf5d5a2566d88c81b73ad
 F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
-P c57c6d52cc3314fdf7a261ec5d23f84da7cb55ea
-R 06761c8737b40e822f72edd98ec944a7
-U Kostas
-Z cff6908be5bbb900a75531f40ed4eb51
+P 6aae13994552e35d6bac4e0936b032a1179c1466
+R 564b4c555c22f1d02d8810e5a92713cd
+U kostas
+Z fdb140e1a5e582d623cdd472b454b5a3
diff --git a/manifest.uuid b/manifest.uuid
index a89aec4..858022c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6aae13994552e35d6bac4e0936b032a1179c1466
\ No newline at end of file
+48ee3014e8868c79f7b8639a9110a24e5743d184
\ No newline at end of file
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 216d338..ddf87c6 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1931,7 +1931,7 @@ void MainWindow::on_actionDelete_triggered()
 void MainWindow::on_actionRevert_triggered()
 {
 	QStringList modified_files;
-	getSelectionFilenames(modified_files, RepoFile::TYPE_EDITTED|RepoFile::TYPE_DELETED|RepoFile::TYPE_MISSING);
+	getSelectionFilenames(modified_files, RepoFile::TYPE_EDITTED|RepoFile::TYPE_DELETED|RepoFile::TYPE_MISSING|RepoFile::TYPE_CONFLICTED);
 
 	if(modified_files.empty())
 		return;