okay
another commit
fixed conflict in project file