Fixed Github merging issue