still fixing code
resolved conflicts