first commit
fix conflich