removed random file
added merge