add comments for functions
resolve conflicts