merged changed from before local repositery become corrupt