Merge bugs fixed