made everything ready for update by merging