Resolved conflicts in various project files.