add API comments
resolve conflicts