merging issue resolved :3