fixed unresolved merge errors