Fixing merge error
Auto-merging phos_dcs_3.pro
CONFLICT (content): Merge conflict in phos_dcs_3.pro
Auto-merging mainwindow.cpp
CONFLICT (content): Merge conflict in mainwindow.cpp