company profile completed
resolve conflicts
resolve conflicts, fix bugs