Merged development directory with git directory