Corrected project after merge