Fixing errors made in merging project file.