solve conflicts
Merge pull request #15 from go-lab/solve_conflict

solve conflicts