small changes
resolved conflicts