fixed project properties (merge went wrong)