Updating to version 6
resolved conflict