hopefully made a good merge with aashiq