fixed merge bash script