first commit
fixed conficts