merge from xampp folder