completed for functionality
resolved conflicts