firts commit bx
resolved conflicts