Merge bugs Fixed