Reverting changes from merging;