updated build tool version
resolved conflict