completed addition function
resolved conflicts