fixed last commit; project builds but is missing functionality #17
proj properties merge
added changes to merge conflicts, #17