Fixed unnoticed previous conflicted