fixed error merge