build updates
resolved conflicts