comments added to my code
resolved conflicts