error merge resolved