Fixed Merged issues