Updated project file.
fixed merge conflicts