removed remaining merge error