failed merging, reverting