merge bugs fixed