Solved merge bugs