changes due to merge conflicts