Intermidiate version
Conflict resolution
QProcess working fine for gedit