first init
added htaccess
merging with remote