removed extensions
merge
fixed csproject