added new features
resolved conflicts