Reverting due to merge conflicts