[FIX] Resolved conflict in project file.