Fixed merged problems,