first commit
fix confilicts