first sketch
fixed first commit merge conflix