changed projevt files after merge and git cleanup