first commit
solve confilicts