reverting merge manually by copying from cesine into local files