first commit
fixing conflits