updated version
merged conflicts